Proof of concept for function interpolation. - #48
Closed
hakoerber wants to merge 14 commits into
Closed
Conversation
added 3 commits
July 25, 2015 13:56
This makes it easier to add other kinds of interpolation later on.
Everything inside $[...] blocks is treated as a function. Right now,
only print() is supported, which just concatenates and all its arguments to a string.
So for example,
key: $[print(a, b, c)]
would resolve to
key: "a b c"
Owner
|
This looks very interesting. The only thing I'd say is that the functions should be provided (registered) as proper Python objects, rather than string-compared within a function. What do you think about that? |
Author
|
Good idea, I will look into it. |
Author
|
Ok, I think this is much more readable and can be extended easily if additional functions are needed. |
added 3 commits
July 25, 2015 16:58
This is to allow python dict access in the function, like node['ip'].
This is needed because functions in a node definition might access other nodes.
This is a bit hacky. Parameter expansion inside function interpolation does not work, so $<aggregate(node[name] == ${some:value}, node[name])> fails.
Author
|
So, this is a first working version. I resorted to always doing a complete inventory, even if only simple nodeinfo is requested. At the end of an inventory run, the functions are expanded, and each function gets the complete inventory as a parameter so it can query other hosts. Things that are missing:
|
added 6 commits
July 28, 2015 03:34
Instead of returning a list of all extracted values, it now returns a dict mapping the nodename to the extracted values.
This did not work beforehand because functions and references were parsed at the same time, but evaluated later. This parsing failed when a reference was nested in a function. To solve this, function evaluation *and parsing* are now done after the whole inventory is available. This means that all references are already expanded, so neither the function nor the reference parsing need to be altered.
- Rename RefValue classes to something more specific:
- ReferenceStringParameter and ReferenceStringFunction represent
strings that contain references (parameters and functions
respectively)
- ReferenceParameter and ReferenceFunction represent references in
the classes above, and can be interpolates/executed
- Revert the behaviour that functions and parameters were parsed at
the same time, but functions "saved" until the whole inventory was
available. Now, functions will be parsed and executed after a
complete inventory run.
Author
|
OK, I reworked it a bit:
The tests still pass, but I'm too lazy to add new ones for the new code. 😄 If you are still interested in the code, I would rebase and clean up the new commits and send a new pull request. |
Collaborator
Author
|
Yup, #56 looks cleaner than this approach. Guess I can close this. |
AndrewPickford
pushed a commit
to AndrewPickford/reclass
that referenced
this pull request
Sep 11, 2018
Add option compose-node-name
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See #47.
This is only a proof of concept and implements a simple
print()function.